Refactor media type sniffing #377
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mickael-menu
commented
Aug 20, 2023
readium/streamer/src/main/java/org/readium/r2/streamer/parser/PublicationParser.kt
Outdated
Show resolved
Hide resolved
| @@ -118,7 +119,7 @@ class ReaderRepository( | |||
| val readerInitData = when { | |||
| publication.conformsTo(Publication.Profile.AUDIOBOOK) -> | |||
| openAudio(bookId, publication, initialLocator) | |||
| publication.conformsTo(Publication.Profile.EPUB) -> | |||
| publication.conformsTo(Publication.Profile.EPUB) || publication.readingOrder.allAreHtml -> | |||
There was a problem hiding this comment.
To support Readium Web Publication with HTML resources such as https://readium.org/webpub-manifest/examples/MobyDick/manifest.json
| ?.let { File(it).extension } | ||
| ?: "tmp" | ||
| val file = File(dir, "$filename.$extension") | ||
| val file = File(dir, "$filename.${extension(context)}") |
There was a problem hiding this comment.
The extension was missing from the URL in the case of a content scheme. This made the format sniffing more expensive.
qnga
reviewed
Aug 21, 2023
...src/main/java/org/readium/r2/shared/publication/protection/AdeptFallbackContentProtection.kt
Outdated
Show resolved
Hide resolved
readium/shared/src/main/java/org/readium/r2/shared/resource/BytesResource.kt
Outdated
Show resolved
Hide resolved
readium/shared/src/main/java/org/readium/r2/shared/util/http/DefaultHttpClient.kt
Outdated
Show resolved
Hide resolved
readium/shared/src/main/java/org/readium/r2/shared/util/mediatype/MediaType.kt
Show resolved
Hide resolved
readium/shared/src/main/java/org/readium/r2/shared/util/mediatype/MediaTypeSnifferContext.kt
Outdated
Show resolved
Hide resolved
mickael-menu
force-pushed
the
remove-fetcher-mediatype
branch
from
600e5f9
to
1c8d360
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
MediaTypeis now a simple class likeUrlandHrefwith no additional information about the format (file extension, name).MediaTypeHintsbundlesfileExtensionsandmediaTypeshints together, to avoid the explosion of APIs for all the various hints combinations, and also to make it clear when amediaTypesproperty is actually for hints.FormatRegistryis used to register known media type file extensions.MediaTypeRetrieveris simplified to delegate the asset opening to theAssetRetriever.MediaTypeRetrieverfor fine-tuned sniffing and then provide a canonicalmediaTypeas output. Apps are encouraged to use this instead of relying on a centralMediaTypeRetrieversupporting all cases.Resource/Containerfrom the media type "module".